Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 21 May 2010 12:26:07 +0000 (12:26 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 21 May 2010 12:26:07 +0000 (12:26 +0000)

Trivial merge